Backport "Fix healAmbiguous to compareAlternatives with disambiguate = true" to 3.5.0 #21344
+597
−105
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.